From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 15 Apr 2008 14:45:42 +0000 (+0100)
Subject: x86, hvm: If an MMIO handler returns X86EMUL_RETRY we must still
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14215^2~186
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=b631149c20d11453d35cc77aa6abe33c7c07189e;p=xen.git

x86, hvm: If an MMIO handler returns X86EMUL_RETRY we must still
complete the dummy I/O request-response cycle.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
index 036583d90c..d7bf9f3f2f 100644
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -76,6 +76,7 @@ static int hvmemul_do_io(
     switch ( rc )
     {
     case X86EMUL_OKAY:
+    case X86EMUL_RETRY:
         *reps = p->count;
         p->state = STATE_IORESP_READY;
         hvm_io_assist();
@@ -87,8 +88,6 @@ static int hvmemul_do_io(
         hvm_send_assist_req(curr);
         rc = (val != NULL) ? X86EMUL_RETRY : X86EMUL_OKAY;
         break;
-    case X86EMUL_RETRY:
-        break;
     default:
         BUG();
     }